Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 00:22:37 +0000 (17:22 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 28 Apr 2011 00:22:37 +0000 (17:22 -0700)
commitfddfaa5a22e2094e362c4096fb5a88a5e76296bf
tree50fc4cc97ebde6cadc04ab294095e80792b5cc94
parent001dde98fb357eb4d3d121a8dbba5eaed0db7d47
parentb9931ceed7529141d2d3de7d85eb79d540ba11db
Merge from mainline.